Merge Branch Conflicts

What criteria does Wappler use to determine there are merge conflicts that need to be resolved?

• If a new file exists in the branch I’m merging into master?
• if a file is deleted?
• if there are changes in specific files that exist in new branch and master?