Remove this files.
Added these files again. This issue is the hardest of all. This is due to the fact that I am using Dropbox to backup my git repository. I will make it a rule to backup everything every week only. Or there should be a day wherein I will not make any changes to the repository unless backed up.
Removed all conflicted copies created by Dropbox.