Mmm, bad merge. Bad Git! Remove this line please.