comment merge fix2