Actually fixing the merge