fix merge with comments