branch test, edited on branch-dev
AND simple have been appended
& simple have been appended
conflict resolved