Sorting conflicts
Creating common sync point