Adding FileMerge placeholder; Simple push; Don't generate .orig files.