last fix on merge error