Initial commit
conflicts resolved