conflict from dev