Hopefully fix the merge conflict