test commit
test conflict on current branch
tested push
solved conflicts