started merging tutorial