fix improper merge