Solve conflicts in default