Fix commit conflict