Proposals can now finish and are merged with the document.
This is all very rudemental, we need to think on a strategy for merge
conflicts.