clean up after conflict resolution