rare merge error gefixt