before pulling Kseniya changes
fixed conflict
fixed sihouette