resolve conflict
fix sync