fixi merge error