Fix some more conflicts and delete auto-gen files

Signed-off-by: Alec Ari <neotheuser@ymail.com>