Fixed a missed merge conflict, edits