Fixes an unintended merge and some other code