Testing new file and merge with old one. Expecting merge conflict.
merge conflict fixed