France and Germany conflict over Morocco