branch test
AND SIMPLE COMMIT
Master version commit
conflict fixed by river