Ruby cleanup
Fix conflict