conflict fixes