fixing texts
resolving conflicts