create conflict
resovle conflict