Resolved conflicts between local branch and updates to the upstream master.
Attach a file by drag & drop or click to upload
