small changes
resolving merge conflict
Merge branch 'naomilong-master'