ruler
interim conflicts resolved