Activity log adding activities to db. First step complete.
correcting conflicts