Added cleanups to profile
Repaired profile badge
resolve conflict
Final push