Fixed an improper merge