offer
fix conflicts