misc merges