new commit
fixed merge conflicts