Fix remaining conflicts