ls-conflicts