Fixed merge mistakes