- resolve conflcit