initial commit
fixed merge conflicts