[Update Merge] Updated merge conflicts and error