first commit
fixed merge conflicts