resolve conflict in manager