and this sprint lasted more than 2 weeks. We have little time less but should NOT start merging stuff that seems hacky