After merge conflict fixes