Fixed issues with merging, missing Tony's portion
Fixed issues with merge, except Tony's