add modifed files from the merge