Tests now incorporated
conflict resolution