conflicts resolved and all merges accounted for