Manually fixing remaining conflicts
Manually fixing conflicts