merge stable into default
using the previous head of default and preserving tags