Conflict cleanup
Merge remote-tracking branch 'MadeInStockholm/develop'