commits
removed a comment
Fixed conflict