merge flicts:
conflict resolution