1st commit
fixed merge conflicts