improper merge