merge sohan master