merge error gefixed