Cleaning up the folders.
resolving the merge conflict