conflict fixed 

what do you think of my requests?