paper complete and ready for editing
fixed merge conflict