conflict solve 13 feb