eight tests
;
;
merge conflict resolve