Fixed Error during merge

What The -f flag!