working on localhost
type inference messing with this
merge resolution