test 0428
commit on new branch
commit on master
commit on contact
merge after conflict