Updating and merging several different versions of files that existed in different environments