started working selectGift
fixed merge errors