merged giftstyle changes manually