ruby/writegood
merging conflicts