fixed merge errors
error fixs;