Fixing a conflict section missed earlier