couldn't merge origin/master with local master
If file is added from both sides it's also a conflict
Merge branch 'dev2' into dev
removed linter error
Merge branch 'dev'