TEST BRANCH
AND SIMPLE
& Simple
CONFLICT FIXED
add Merge
Merge branch 'dev'