Style and merge fixes