Blocking step 1
Blocking step 2 (user block finished)
gitattributes
some fucked commit
Merge remote-tracking branch 'origin/blocking'