changes to experience conflict between puch and pull
resolved conflicts