fixed undefined method error
merge