Testing git branches and merging