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