I think this should solve all conficts