fiix merge troubles