resolved conflict and merged widecontent
resolved leoni