thought this was committed...?
fix conflict in show.html.erb in contacts view