corrected merge issues