fix sync conflict