Fixes the merge error (hopefully!)