Fix that ugly merge...