update new things we learned
formated and resolved merge conflicts