merge conflict testing
merging while ignoring conflicts