updating main class
resolving conflicts