styling & merge fixes