after resolving the conflict