first separate commit on branch1
fixed merge conflicts