Removed all the merge problem notices