work on converting slim to erb
fix merge