Fix improper merge