1 function added, please check is it correct, so that I will add others too!
Merge resolve