minor changes to chores, commiting before pullin
resolved merge conflict