remove merged parts, fix 3G & rebased