test confliction
fix conflic