Fixed merge left-over