merge issue fixed (fancy control was not working)