Add back structure init after conflict