project setting
fix conlicts