actually resolve the conflict this time