removing leftover file from merge