correcting gti push pull merge mistakes