nganluong
clousure
rails 4 conflict
update