Fixed remaining conflicts