init merge
fixed merge conflicts