Removed merge conflict droppings.