merge error, fixed