Deleted leftover file from merge