Fix sync conflicts