build subpackages
fixed conflicts