edit time clash fix