Initial commit
Fixing merge errors