Fixed merge in middle bug