Rename confilict-solved.txt to conflict-solved.txt