merge: use return value of resolve_ref() to determine if HEAD is invalid