merge
fixed haml