[#11] Tidy up after merge conflict