First off, this is an artifact of the merge conflict that needs to be removed