Merge resolve
Commented out inactive assignments