Reset files
merge resolved