re-added hasMerged. Also added comment to prevent it from being removed in the future