create and play with git, get into merge hell