Commit final code
Fixing conflicts