Fixed weird merge issues