Oops, fixed merge conflict