Fixing merge conflict in scratchfile to address #8