git clone is added to git notes
my first merge
previous merge failed, this is merged by hand