Fix an unmerged file
Add description