Fixed merge fouten