===== <<<<<<< HEAD res ===== bar ======= bar1 >>>>>>> squash commits =====