changes in sort
resolve conflict