files and folders added
conflict solved