fixing rb file
merge conflict