Removed conflict syntax in file