Fixes the merge issue that's been done.