Attempting the same merge that aku tried and got empty files with.