deleted merge error :(