Removed a relic from merge

Git didn't catch this for some reason.