git practice
conflicts megrged