payment thanks
fix conflicts