Merge gpt branch