notes from meeting with tom
resolving merge conflicts