initial commit
fixes initial conflicts