test 4: made a change
test 5: made a change
test 6: merged