Import project setting from HoaPTT
fix conflicts