Weird merge problem... should be fixed nwo