Create conflict from dev