Updated Merging From Upstream Sources (markdown)
accept theirs when merging upstream into development
Updated Merging From Upstreasm Sources (markdown)