Test stuffs
Fixed merge issue