resolving conflicts
resolving variables errors