Add files again
Undo this stupid delete merge stuff!