pins files from local box
merging changes
merging changes