fixed improper merge