testing a local commit with a merge to follow