merge fix
fixed erb error