conflict resolved - HT