removed conflicted files
replaced about and contact