clean up merge conflict text