recovering from the git
adding in the example code
test
test
merge fixed