Removing duplicate header from merge conflict…
Removing some un-needed comments