repaired merge errors
deleted gen files