Remove stray merge conflict marker
Remove stray merge conflict marker

lachlanjc/meta,lachlanjc/meta,lachlanjc/meta,assemblymade/meta,assemblymade/meta,assemblymade/meta,lachlanjc/meta,assemblymade/meta