Buncha fixes
Fix the conflict.