Editing of a proposal
merge conflicts