fix conflict after pull