end of the day push
conflict fixes