should we give up and merge this?