edit profile
new homepage design
resolve conflict