edit wrong AD statement from conflict resolution