more merge conflict fixes.

dat merge remote tracker branch spam tho