adding comment. and resolve conflict