test conflot
resolve conflict