Removed comments
Fixing conflict