giant clock
resolving conflicts