preparing to merge
fixed merge conflicts