I know, this merge conflict is a calculated one