Initial commit
Fixing conflicts