applied patch
merge conflict