Removed old comment
Removed old comment and merged conflicts