Removed unfixed merge conflict markers. Oops.