resolved checked in conflicts