checking in before pulling what nick has
fixed merge conflicts