Take out the silly merge conflict