Ruby string delimeters
Fix merge conflicts