Lets try to merge... again