merge probleem gefixt