kay merge errors fixed?

think, i think