resolving_conflicts

learning GIT step by step