same application to test out git branching/merging