:Added all the changes
:Deleted unwanted files
:Fixed conflicts