initial commit
fixed merge errors