Adding missing conflict and provide to -dev