test merging with jon