join feature done and start working on profile
resolve bugs