Fixes bad merge