naive diff merge to paper