manuel merging with FTs commits