removed junk from user profile
Merge pull request #63 from brucetoddlee/removed_conflict_notice

removed junk from user profile