Remove merge conflict from family.fea.

e74e645 fixed the corruption from a merge conflict in the .ufo files themselves - but not in family.fea. The latter also needs to be fixed in order to make the font compilable.