commit before major pull
commit after pull
fixed clocks
fixed merge conflict re social links