Corrected merge issues.