git merge development... 19 conflicts? What the fuck? Fuck this, I'm going back to dropbox

flag as inappropriate

Create your own!
      git merge development... 19 conflicts? What the fuck? Fuck this, I'm going back to dropbox