Create conflict-detection

asdf