Removed previous merge conflict leftovers