merge conflict fixed?
merges resolved