merge .spec changes