Corrected merge conflicts.