Makes sense, but you'll need to fix the merge conflict...