readme fix hr
updating display templates docs
fixed merge conflicts
fixed merge conflicts'