The Entente Cordiale of 1904 was an agreement between Britain and France in which they agreed to settle their Imperialist disputes peacefully. The agreement also included mutual recognition of French control of Morocco, which caused a crisis in 1905 when Germany opposed this arrangement. To try and resolve the issue, Germany suggested holding an international conference on Morocco in 1906, which eventually resulted in the Algeciras Conference of 1906.
I would suggest looking up some more information on the Entente Cordiale and the Algeciras Conference for guidance.