Deleted gen files that keep causing merge conflicts