Fixed merge problemes