Ymt/feature/confrict1