just a commit
resolving conflict
delete extra file