Solved the conflict