Fixed sync conflicts.