Fixes messed up merge