fixing things
merge with remote