fixed mergeItem color updates: red=conflict, yellow=view conflict, green=res conflict