Test Project to play with merging and rebasing