updates from neurana
resolving conflicts