Testing git's merge feature