Changing comments
Fixing conflicts