branch test
and simple
& simple
confict fixed
test amend success