project setting
fix conflicts