error fixing
fixed merge conflicts