post logging
readme changes
resolved conflitcs