add a file
merge changes