Commit conflict fix.