Prompt to write over files.
Merge with upstream