Modified comment by gittest
Fixed merge conflict