Fixed merge issues?