jw preso edits
resolved conflicts