Fixed interrupted merge