Corrected merge conflicts