changes on the branch
after stashing on the branch
new folder
added during merge conflict