simple madpad working
fix merge