stupid conflict fixes