Solve conflicts between each other