changing format
test conflict
resolve conflicts
Merge branch 'master' of git@github.com:pirest89/edi.git
change format