from devel
resolv conflict