tempaltizing rails admin views
fixed merge conflict