Fixed George's merge