Fixed merge issues