Adding date ordering
Resolving conflicts