initial commit
fixed merges