Recovered conflicted files from failed merge