fixed comments errors
fixed merge errors