first separate commit on master
fixed merge conflicts