time conflict done now almost done