fix chat template
fix conflicts