Resolving conflict in code base.
less jqueries