another merge conflict change, before remerge Andrew's add-on