rayita2
fix merge