all merged, working