checking conflict resolution

checking conflict resolution