Fixing bad merge conflict