uon merge conflict fixes