Fixes some conflicting files.