initial commit
fixin merge conflicts