new personal profile
fix merage conflict