after resolved the conflict