significantly improved merge detection
pack button is important =)