This may be a conflict resolution, but there are now two lines that say 'required'