practice using git and resolving conflicts