cleaned up merge conflict text