fix contacts page
fix merge conflicts