removed merge conflict notice