Merge conflict fixes - again