removed comments
merge confilct resolved