Merge error deleted and fixed