Remove leftover file from bad merge