Competition length, start, end implemented
Git conflict resolution