Resolving the unmerged
Add a new file