Readd conflicts
Add conflict status in filename