before pull
fix conflict