Fix merge conficts in source