First commit
Fixing conflicts