Updated merge conflict issues

Updated merge conflict issues