Fixing bad merge