Tarrif Mangement completed
conflict resolved