exercise-repo This is made for exercises! Conflict is resolved obvously. Come on ,faster boy! Hello , looking for another branch conflict. Okay here it is . bash change bash conflict what ? another conflict ? branch 1 some changes branch2