Dry up assignment
Fix merge issue