Fixed the committed merge conflicts