fixed a couple errors when merging