Oi/hipster

Conflict fixed, should be OK now.