Initial commit
fixed merge conflicts