Fixed bug in merge: improper use of force and failing on FORCED result
Update contributors list
Allow resolve for proposal workflows
Documentation and clarify git workflows