/conflict

just an exercise with to get familiar with git

conflict

just an exercise with to get familiar with git