Initial commit
resolving all conflicts