second commit
fixed merge conflicts