Readd changed files.
Clean up conflict