revert back merge error