Unmerged files error
Merge branch 'master' of https://github.com/dot-bin/Arc