Corrected merge issues