Conflicts removed in viewcontroller