Consolidated variables
Resolving Conflicts