testing out git and merging