WIP: squash, fix the merge