creates a conflict
resolves conflict