Conflicts fixed