fixed styles; update ka locale
fix merge conflict