pretty cure correctly merges now