haml branch merged