Clean up the edit branch and edit quip confusion by just merging them together.