Just kidding, this should result in a merge commit!