merge with more recent local copy
added new file