removed merge conflicts for internship partial, internship admin p…

Removed the merge conflicts