Testing git merging stuff