working with live data
resolve merge conflict