conflicts and more conflicts bla solved maybe