Initial commit
Resolve merge conflicts