Merge conflicts issue fixed