small changes
Fixed merge and and added md in docs