Simple project to test merging