two conflicts fixed in merger