First hack at disposal of review1.txt
merge conflict, doh