Merge with changed files of Pieter send by e-mail